* vc.el (vc-mark-resolved): Move message here from vc-default-mark-resolved.

(vc-default-mark-resolved): Change to an alias for ignore.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4abcf07dcd863702906fa5cb1eb9325223d3a74a..a9159efe5e15ede8f0536559bb3dcc8fb4879956 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-25  Chong Yidong  <cyd@stupidchicken.com>
+
+       * vc.el (vc-mark-resolved): Move message here from
+       vc-default-mark-resolved.
+       (vc-default-mark-resolved): Change to an alias for ignore.
+
 2008-09-24  Andreas Politz  <politza@fh-trier.de>  (tiny change)
 
        * term.el (term-emulate-terminal): Encode input string before